[HVM] Wnable sound card support for qemu.

Need a sound card to pass some benchmark check.

Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>

diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm
index b303adfeadefe748ee5667032d03dfe7ea55497b..3d7f85263f37686ffad0fab935adc8de70cad749 100644 (file)
--- a/tools/examples/xmexample.hvm
+++ b/tools/examples/xmexample.hvm
@@ -149,8 +149,8 @@ serial='pty'
 
 
 #-----------------------------------------------------------------------------
-#   enable audio support
-#audio=1
+#   enable sound card support, [sb16|es1370|all|..,..], default none
+#soundhw='sb16'
 
 
 #-----------------------------------------------------------------------------

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index d74668ab2701b7cc122b2ae3abdbf1881d5745b0..f3fa7d11c6ae64fa8eb233520d03a76c337de5a1 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -249,7 +249,7 @@ class HVMImageHandler(ImageHandler):
     # Return a list of cmd line args to the device models based on the
     # xm config file
     def parseDeviceModelArgs(self, imageConfig, deviceConfig):
-        dmargs = [ 'boot', 'fda', 'fdb', 'audio',
+        dmargs = [ 'boot', 'fda', 'fdb', 'soundhw',
                    'localtime', 'serial', 'stdvga', 'isa', 'vcpus',
                   'usb', 'usbdevice']
         ret = []
@@ -258,10 +258,9 @@ class HVMImageHandler(ImageHandler):
 
             # python doesn't allow '-' in variable names
             if a == 'stdvga': a = 'std-vga'
-            if a == 'audio': a = 'enable-audio'
 
             # Handle booleans gracefully
-            if a in ['localtime', 'std-vga', 'isa', 'enable-audio', 'usb']:
+            if a in ['localtime', 'std-vga', 'isa', 'usb']:
                 if v != None: v = int(v)
                 if v: ret.append("-%s" % a)
             else:

diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 109e8a874173f2fc0cf3e4066bf50e366735fb5a..c19c7ff515b5417cfcd62d2b9736724e176eaad9 100644 (file)
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -400,9 +400,9 @@ gopts.var('nographic', val='no|yes',
           fn=set_bool, default=0,
           use="Should device models use graphics?")
 
-gopts.var('audio', val='no|yes',
-          fn=set_bool, default=0,
-          use="Should device models enable audio?")
+gopts.var('soundhw', val='audiodev',
+          fn=set_value, default='',
+          use="Should device models enable audio device?")
 
 gopts.var('vnc', val='',
           fn=set_value, default=None,
@@ -626,7 +626,7 @@ def configure_hvm(config_image, vals):
     """Create the config for HVM devices.
     """
     args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb',
-             'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'audio',
+             'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
              'vnc', 'vncdisplay', 'vncconsole', 'sdl', 'display',
              'acpi', 'apic', 'xauthority', 'usb', 'usbdevice' ]
     for a in args: